When using the separate files and getting conflicts related to Jinpu/Gekko and Jinpu/Shifu, feel free to overwrite anything with anything. 
They use the same files that are doubled when using the separate skills version.